GDK W32: Fix the filling of MINMAXINFO

1) MSDN says that the coordinates of the maximized window
   must be specified as if the window was on the primary display,
   even if nearest display where it ends up is not the primary display.
   So instead of using nearest display work area verbatim,
   use it only to account for taskbar size, while using
   primary display top-left corner (0:0) as the reference point.
2) MSDN says that max tracking size is a system property, we
   should just call GetSystemMetrics() and use that.

https://bugzilla.gnome.org/show_bug.cgi?id=762629

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 51bf3422d7c9046ebdc795742dccb451d29a620c..5f8015caf644017aafab5e3a3d94b0969e85643b 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3177,29 +3177,29 @@ gdk_event_translate (MSG  *msg,
        */
       else if ((style & (WS_BORDER | WS_THICKFRAME)) == 0)
        {
-         HMONITOR winmon;
-         MONITORINFO moninfo;
+         HMONITOR nearest_monitor;
+         MONITORINFO nearest_info;
 
-         winmon = MonitorFromWindow (GDK_WINDOW_HWND (window), MONITOR_DEFAULTTONEAREST);
+         nearest_monitor = MonitorFromWindow (GDK_WINDOW_HWND (window), MONITOR_DEFAULTTONEAREST);
+         nearest_info.cbSize = sizeof (nearest_info);
 
-         moninfo.cbSize = sizeof (moninfo);
-
-         if (GetMonitorInfoA (winmon, &moninfo))
+         if (GetMonitorInfoA (nearest_monitor, &nearest_info))
            {
-             mmi->ptMaxTrackSize.x = moninfo.rcWork.right - moninfo.rcWork.left;
-             mmi->ptMaxTrackSize.y = moninfo.rcWork.bottom - moninfo.rcWork.top;
-             mmi->ptMaxPosition.x = moninfo.rcWork.left;
-             mmi->ptMaxPosition.y = moninfo.rcWork.top;
-           }
-         else
-           {
-             /* Apparently, this is just a very big number (bigger than any widget
-               * could realistically be) to make sure the window is as big as
-               * possible when maximized.
-               */
-             mmi->ptMaxTrackSize.x = 30000;
-             mmi->ptMaxTrackSize.y = 30000;
+             /* MSDN says that we must specify maximized window
+              * size as if it was located on the primary monitor.
+              * However, we still need to account for a taskbar
+              * that might or might not be on the nearest monitor where
+              * window will actually end up.
+               * "0" here is the top-left corner of the primary monitor.
+              */
+             mmi->ptMaxPosition.x = 0 + (nearest_info.rcWork.left - nearest_info.rcMonitor.left);
+             mmi->ptMaxPosition.y = 0 + (nearest_info.rcWork.top - nearest_info.rcMonitor.top);
+             mmi->ptMaxSize.x = nearest_info.rcWork.right - nearest_info.rcWork.left;
+             mmi->ptMaxSize.y = nearest_info.rcWork.bottom - nearest_info.rcWork.top;
            }
+
+         mmi->ptMaxTrackSize.x = GetSystemMetrics (SM_CXMAXTRACK);
+         mmi->ptMaxTrackSize.y = GetSystemMetrics (SM_CYMAXTRACK);
        }
 
       if (impl->hint_flags & (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE))